[FLOC-4480, FLOC-4483] Fix docker systemd dropin configuration files and add docker plugin ID for Docker 1.12 #2880
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 5 commits
August 1, 2016 17:47
Signed-off-by: Ryan Wallner <ryan.wallner@clusterhq.com>
…ests Signed-off-by: Ryan Wallner <ryan.wallner@clusterhq.com>
…-add-id-FLOC-4480-FLOC-4483
This was referenced Aug 3, 2016
wallrj
changed the title
| @@ -834,10 +834,13 @@ def task_enable_docker(distribution): | |||
| # Use the Flocker node TLS certificate, since it's readily | |||
| # available. | |||
| docker_tls_options = ( | |||
| '--tlsverify --tlscacert=/etc/flocker/cluster.crt' | |||
| '--tls=true --tlscacert=/etc/flocker/cluster.crt' | |||
There was a problem hiding this comment.
I think we should keep '--tlsverify. It ensures that docker daemon only accepts TLS connections from clients with a certificates signed by the Docker CA.
--tls Use TLS; implied by --tlsverify
--tlscacert=~/.docker/ca.pem Trust certs signed only by this CA
--tlscert=~/.docker/cert.pem Path to TLS certificate file
--tlskey=~/.docker/key.pem Path to TLS key file
--tlsverify Use TLS and verify the remote
|
Thanks @wallnerryan Looks good.
I'll do that and kick off the tests again and then merge. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In order for one of these to pass, its needs the other. Creating one branch for both.
See:
NOTE- this only fixes acceptance testing for Docker >= 1.12. This will likely break acceptance tests for older versions of docker < 1.12. If we plan on fixing that we should create a seperate issue that allows us to flip flop these type of configurations based on the docker version we want to test.